cleanups, especially to loggers #10865

gavinking · 2025-09-03T11:06:51Z

[Please describe here what your change is about]

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

because we were inconsistent here

hibernate-github-bot · 2025-09-03T11:06:58Z

Thanks for your pull request!

This pull request does not follow the contribution rules. Could you have a look?

❌ All commit messages should start with a JIRA issue key matching pattern HHH-\d+
↳ Offending commits: [4384cc7, 5b55041, 6b0c15f, e6d4cc2, 7eb1110, 5ad5d42]

› This message was automatically generated.

hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java

-		if ( LOG.isTraceEnabled() ) {
-			LOG.trace( "Persisting " + infoString( persister, id, source.getFactory() ) );
+		if ( log.isTraceEnabled() ) {
+			log.trace( "Persisting " + infoString( persister, id, source.getFactory() ) );


hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java

-		if ( LOG.isTraceEnabled() ) {
-			LOG.trace( "Deleting " + infoString( persister, entityEntry.getId(), session.getFactory() ) );
+		if ( log.isTraceEnabled() ) {
+			log.trace( "Deleting " + infoString( persister, entityEntry.getId(), session.getFactory() ) );


hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java

 			if ( status == Status.DELETED ) {
 				if ( !persister.isMutable() ) {
-					LOG.trace( "Updating immutable, deleted entity: " + info );
+					log.trace( "Updating immutable, deleted entity: " + info );


hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java

 				}
 				else if ( !entry.isModifiableEntity() ) {
-					LOG.trace( "Updating non-modifiable, deleted entity: " + info );
+					log.trace( "Updating non-modifiable, deleted entity: " + info );


hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java

 				}
 				else {
-					LOG.trace( "Updating deleted entity: " + info );
+					log.trace( "Updating deleted entity: " + info );


hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java

+		if ( log.isTraceEnabled() ) {
 			if ( Hibernate.isInitialized( obj ) ) {
-				LOG.tracev( "Starting serialization of object [{0}]", obj );
+				log.tracev( "Starting serialization of object [{0}]", obj );


hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

-		if ( LOG.isTraceEnabled() ) {
-			LOG.tracev( "Getting version: {0}", infoString( this, id, getFactory() ) );
+		if ( log.isTraceEnabled() ) {
+			log.tracev( "Getting version: {0}", infoString( this, id, getFactory() ) );


hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

-		if ( LOG.isTraceEnabled() ) {
-			LOG.tracev( "Fetching entity: {0}", infoString( this, id, getFactory() ) );
+		if ( log.isTraceEnabled() ) {
+			log.tracev( "Fetching entity: {0}", infoString( this, id, getFactory() ) );


hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java

+			log.trace( "Collection fully initialized: "
+						+ collectionInfoString( collectionDescriptor, collection, key, session ) );


hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java

+			log.trace( "Caching collection: "
+						+ collectionInfoString( collectionDescriptor, collection, key, session ) );


and stricter enforcement of @DiscriminatorValue requirement (I don't think this is a substantive change to behavior, but it might be).

beikov · 2025-09-03T12:51:40Z

I personally would prefer to stick to UPPER_CASE for static final variables like LOG instead of lower case log. That is a common naming scheme and helps quickly understand that something is a constant without checking the definition, so -1 on the naming change from me.

hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java

+			log.trace( "Collection dereferenced: "
+						+ collectionInfoString( loadedPersister, collection, entry.getLoadedKey(), session ) );


hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java

+			log.trace( "Found collection with unloaded owner: "
+						+ collectionInfoString( loadedPersister, collection, loadedKey, session ) );


hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java

+				log.trace( "Skipping uninitialized bytecode-lazy collection: "
+							+ collectionInfoString( persister, collection, collectionEntry.getCurrentKey(), session ) );


gavinking · 2025-09-03T13:06:00Z

I personally would prefer to stick to UPPER_CASE for static final variables like LOG instead of lower case log. That is a common naming scheme and helps quickly understand that something is a constant without checking the definition, so -1 on the naming change from me.

I really don't think it matters much at all if these are lower or upper case. I very slightly prefer lowercase because it makes the log statements stand out somewhat less. (Logging crap is ugly enough without having it shouting at me.)

But I do think it's a good idea to be at least consistent across the whole code base. And we're not consistent right now.

Whatever, I'm not going to redo this work. But I'm not going try to to stop you renaming everything to uppercase, as long as you do it everywhere.

gavinking · 2025-09-05T10:50:31Z

replaced by #10879

gavinking added 4 commits September 3, 2025 20:07

tiny refactoring in proxy interceptors

4384cc7

standardize on lowercase 'log'

5b55041

because we were inconsistent here

use existing helper method to obtain CoreMessageLogger

6b0c15f

some minor cleanup in stat.internal package

e6d4cc2

gavinking marked this pull request as ready for review September 3, 2025 11:07

github-advanced-security bot found potential problems Sep 3, 2025

View reviewed changes

gavinking added 2 commits September 3, 2025 22:35

more minor cleanups in Collections util class

7eb1110

more minor cleanups in EntityBinder

5ad5d42

and stricter enforcement of @DiscriminatorValue requirement (I don't think this is a substantive change to behavior, but it might be).

github-advanced-security bot found potential problems Sep 3, 2025

View reviewed changes

gavinking closed this Sep 5, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Uh oh!

cleanups, especially to loggers #10865

cleanups, especially to loggers #10865

Uh oh!

gavinking commented Sep 3, 2025

Uh oh!

hibernate-github-bot bot commented Sep 3, 2025 •

edited

Loading

Uh oh!

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

beikov commented Sep 3, 2025

Uh oh!

Check failure

Check failure

Check failure

gavinking commented Sep 3, 2025

Uh oh!

gavinking commented Sep 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		log.trace( "Collection fully initialized: "
		+ collectionInfoString( collectionDescriptor, collection, key, session ) );

		log.trace( "Caching collection: "
		+ collectionInfoString( collectionDescriptor, collection, key, session ) );

		log.trace( "Collection dereferenced: "
		+ collectionInfoString( loadedPersister, collection, entry.getLoadedKey(), session ) );

		log.trace( "Found collection with unloaded owner: "
		+ collectionInfoString( loadedPersister, collection, loadedKey, session ) );

		log.trace( "Skipping uninitialized bytecode-lazy collection: "
		+ collectionInfoString( persister, collection, collectionEntry.getCurrentKey(), session ) );

Uh oh!

Uh oh!

cleanups, especially to loggers #10865

cleanups, especially to loggers #10865

Uh oh!

Conversation

gavinking commented Sep 3, 2025

Uh oh!

hibernate-github-bot bot commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

beikov commented Sep 3, 2025

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

Check failure

Uh oh!

gavinking commented Sep 3, 2025

Uh oh!

gavinking commented Sep 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hibernate-github-bot bot commented Sep 3, 2025 •

edited

Loading